Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 15 Nov 2011 06:26:25 +0000 (22:26 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 15 Nov 2011 06:26:25 +0000 (22:26 -0800)
commit67222263283a48b011b24734d79f7fbdde3faaa6
tree03aaa6e0e87d1c528ca6c7c6ae6dbe3b4ee45261
parenta8172bf31136eafec88d9172b4ad24ee7ed2fdd8
parent9276509fe164b599169450a55dd3371c07786865
Merge from trunk.